From 275b4e17f3fd37d21c7af4693c8b85a7226aa536 Mon Sep 17 00:00:00 2001 From: robertl Date: Tue, 17 Jun 2008 17:17:11 +0000 Subject: [PATCH] Add option to 'discard' filter to toss points with no or unknown fix. --- discard.c | 12 ++++++++++++ xmldoc/filters/options/discard-fixnone.xml | 5 +++++ xmldoc/filters/options/discard-fixunknown.xml | 5 +++++ 3 files changed, 22 insertions(+) create mode 100644 xmldoc/filters/options/discard-fixnone.xml create mode 100644 xmldoc/filters/options/discard-fixunknown.xml diff --git a/discard.c b/discard.c index 0a8d29e4d..fbb00f156 100644 --- a/discard.c +++ b/discard.c @@ -27,6 +27,8 @@ static char *hdopopt = NULL; static char *vdopopt = NULL; static char *andopt = NULL; static char *satopt = NULL; +static char *fixnoneopt = NULL; +static char *fixunknownopt = NULL; static double hdopf; static double vdopf; static int satpf; @@ -43,6 +45,10 @@ arglist_t fix_args[] = { NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, {"sat", &satopt, "Minimium sats to keep waypoints", "-1.0", ARGTYPE_BEGIN_REQ | ARGTYPE_INT, ARG_NOMINMAX}, + {"fixnone", &fixnoneopt, "Suppress waypoints without fix", + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, + {"fixunknown", &fixunknownopt, "Suppress waypoints with unknown fix", + NULL, ARGTYPE_BOOL, ARG_NOMINMAX}, ARG_TERMINATOR }; @@ -71,6 +77,12 @@ fix_process_wpt(const waypoint *wpt) if ((satpf >= 0) && (waypointp->sat < satpf)) del = 1; + if ((fixnoneopt) && (waypointp->fix == fix_none)) + del = 1; + + if ((fixunknownopt) && (waypointp->fix == fix_unknown)) + del = 1; + if (del) { switch(what) { case wptdata: diff --git a/xmldoc/filters/options/discard-fixnone.xml b/xmldoc/filters/options/discard-fixnone.xml new file mode 100644 index 000000000..b7b849354 --- /dev/null +++ b/xmldoc/filters/options/discard-fixnone.xml @@ -0,0 +1,5 @@ + + This option is similar to the 'sat' option, but there are times when + some GPSes will know how many satellites are in view, but not yet computed + a valid fix. This option allows you to discard those points. + diff --git a/xmldoc/filters/options/discard-fixunknown.xml b/xmldoc/filters/options/discard-fixunknown.xml new file mode 100644 index 000000000..006382908 --- /dev/null +++ b/xmldoc/filters/options/discard-fixunknown.xml @@ -0,0 +1,5 @@ + + This option is similar to the 'sat' option, but some GPSes will log + points with a fix value of 'unknown'. + This option allows you to discard those points. + -- 2.30.2